chore: Protocol tests set their own AWS credentials #1784
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbelkins
changed the title
jbelkins
commented
Oct 9, 2024
| @@ -118,7 +118,6 @@ jobs: | |||
| set -o pipefail && \ | |||
| NSUnbufferedIO=YES xcodebuild \ | |||
| -scheme aws-sdk-swift-protocol-tests-Package \ | |||
| -testPlan ProtocolTestPlan \ | |||
There was a problem hiding this comment.
This protocol test plan is deleted (see below). Its only purpose was to get credentials into Xcode test runs, now this is done in protocol test setup.
jbelkins
commented
Oct 9, 2024
| run: | | ||
| echo "[default]" > ~/.aws/credentials | ||
| echo "aws_access_key_id = test-key-id" >> ~/.aws/credentials | ||
| echo "aws_secret_access_key = test-secret-access-key" >> ~/.aws/credentials |
There was a problem hiding this comment.
The code above is deleted since credentials are now provided statically at protocol test client creation.
jbelkins
commented
Oct 9, 2024
| @@ -12,6 +12,7 @@ import ClientRuntime | |||
| import Smithy | |||
| import SmithyTestUtil | |||
| import XCTest | |||
| import func SmithyTestUtil.dummyIdentityResolver | |||
There was a problem hiding this comment.
The 4 tests below demonstrate the code changes to protocol tests.
The SmithyTestUtil.dummyIdentityResolver function provides a static identity resolver with some dummy AWS credentials.
jbelkins
commented
Oct 9, 2024
| signingRegion: "us-west-2", | ||
| idempotencyTokenGenerator: ProtocolTestIdempotencyTokenGenerator(), | ||
| httpClientEngine: ProtocolTestClient() | ||
| ) | ||
| let client = S3Client(config: config) | ||
|
|
||
| let input = GetObjectInput( |
There was a problem hiding this comment.
The .xcscheme and .xctestplan files below are deleted because they are unnecessary.
- The
.xctestplanwas only used to inject credentials in environment vars, those credentials are now supplied via static identity resolver. - The
.xcschemeis auto-generated by Xcode on demand, with all targets in the package included. Having a hard-coded.xcschememakes it necessary to add new tests to the scheme as they are added; this results in skipped tests if not done. Not a problem with the auto-generated scheme since it auto-generates for every test run. The auto-generated scheme has the same name as the now-deleted.xcschemefile, so no change to scheme name where it is referenced.
2 tasks
dayaffe
approved these changes
Oct 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Companion
smithy-swiftPR: smithy-lang/smithy-swift#837Simplifies protocol test config to accompany the changes in
smithy-swift. This PR also includes code-generation changes.smithy-swiftPR..xcschemeand.xctestplanfor protocol tests are deleted, since they served no purpose other than to facilitate credentials provided through env vars.New/existing dependencies impact assessment, if applicable
No new dependencies were added to this change.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.